Fix for model mapping