patched with list validation