Fix for azmodel