destroy on production bug fixed