Fixed the bugs related to CFF & merged to upstream

I thought you were going to wrap this in a debug statement.