Remove fallback even further to try to fix bug