IS #7 fix attempt at taking a shortcut