Fixing #157