Fixed the broken handle-change code