Fixed problem from merge