Fixed problem from merge from master.