Fix for guard functions having an extra argument