AXS-1602. Another fix attempt.