Some improvements in order to avoid false values