ACs 1.8.8: global handler fix and unsubscribe fix