Fixed #260.
Fixed #261.