Fix #278
Fix #280