Fix #252
Fix #239