Additional fix for POMA-6671