Fixed for the new framework