fix for CFK-115