CS fix

I hope this is not BC break though handler_id checking should be done with identical comparison operator I believe.