Fixing args check