Work around for our model code