fixing problems from last commit