fixes #99 for @restless