commit with errors, because of changing structure