Quick fix for QAART-405