For #85 fixing value