Removed '0 second' check