Trying to fix previous bomb problem