crash ... elias, verify your commit please