Removed unneeded args check