Fix for AS7-6276.