Fixed showing proper values