Fixing function checking