Fixed #645