Fixes  #17