Fix #236
Fix #234