Fixed issue with UI lock