Fix for dynamic UIs