cf stub fixed