making master less broken