fix for CFK-149