UI code change fixes #23