Fixed #648