Fix for failing QA