Bugfix for UCP