Merge pull request #411 from Exalm/wip/exalm/oops