Fixed #657