CE-298 Adding fixme for count on MASTER