Changed placement of conditional