Fixed ZEN-9838 issue (Modeling error after zenpack update)