fix for CON-108