Feature/fix datalot code 6 bug