Added workaround for controller problem