Fixes  #6