Fixes  #157