better current master detection