Fixed a needless if return shenanigins