Fixed #644