Fix for nAa 06 Part 2