fix for GPTOMCAT-8