fixed problem from merge