fixed broken code from merge