Explosion fix attempt #1