fix for CFK-114