fix for CFK-133