Handle args correctly