Fixing #79