Attempt at fixing double fireball