Fixed #798