fix master lookup