Quickfix for UC rendering