Fix odd behaviour with IDs and fallbacks