Fix for model resolving.