Fixed #774