fix: the logic for getting the handler

fix: the logic for getting the handler #482