Fixed #694