Remove one last check for zero