Fix #253 Fix #254