Fixed #235.
Fixed #236. Fixed #237.