Fixed issue from merge