fix for VIDK-36