fix for CFK-113