trying to fix for 4.4 part 2