Fix for failing QA test on MySQL (try 2)