this is the fix, and same in the other handler