fix: problem with refactor dat order