fix type from the previous commit
Merge branch 'szo9' into sezero