Add fix for annoying MUC problem