[Evgeny, Jason] fixed change_data