fix for AS7-6276