still crashing, even with conservative optimization
restore old workaround