fixes for modeling