One last attempt to fix the handler