typo fix + default handlers