fixed defuse bug