Fix for QA