arguments validation fixing