Fixed #636