Fixed #620