Fixed #555. Fixed #350.