Avoid unneeded logic