Master Controller fix