Temp fix until choupom fix events