Removed '> 0' in if count() function