Fixed #653; Progress on #648