Fixes problem from merge