Updated the handler for the case I am seeing.