fix for CFK-108