Fixing explosion bugs