fix master to at least work on its own