IS #9 fix attempt at taking a shortcut