Fixed error from prematurely returning false