fixes regression from merge