fixed problems from merge