Fallback class fix