Fixing run/destroy logic