[IN] Fix according to new version of framework