Small fix on output values