Fix #246 in dev.