Fixed #625