Fix #256
Fix #279