Fixed problem from merge in relation files