Added fix for unregistered words