fixed *master-context* binding