Fix the master server workaround