Handle going out issue fixed