fixed problem with values order