fix for @hugo and @linus