Fixes  #187