Fixes  #54