Fixed #688