Fix request getting overwritten by custom handler