(Hopefully) fix for failing QA test part 2