Fixed #794