Fix bug with UI