Switch to using proper halt method