fixed fallbacks