fix for last merge part 1