Fix bug in entrying master