Fixes  #852