Fixs #847