Fix for hydration with 'empty' identifiers

Should fix #456