Removing `else` so the fallbacks indeed get used