fix master controller