changed return; to return true;