Fixes invalid values metrics considerations