Fix #637 narrowing behavior