Fixed #639