removed valid check