Fixing FIC to work with newer API