master: fixed assignment problem