Fix logic again *sigh*