Fix error where key is not handled