Fixed #627