Fixed #693