Added fallback for default $state