Check on empty parameters not even needed now