Fixed #677