Fixed #631