resolve controller mismatches