Fixed #629