Fix for when arguments aren't passed