This conditional should resolve testing issues without any change to previous functionality