Fix #248
Fix #248.
Fix #252.