hack for master before refactor