fixing problems from merge with reskin