Fixing #155