Context destroy fixed