Fix #637 narrow behavior