Correcting how handler was saved and retrieved