Fixed #438. Fixed #742.