fixed errors introduced through my faulty rebasing