elimited potential nuke bug!