fix for CFK-112