Fix from merge