Hotfix for spinner models