Framework core fix