Fixed #842