Fixed #626