Adjust previous fix

So that behaviour in the absence of UI is unchanged