Fixed Master/Slave identification in context