This may solve the UI tests regression