Updated source to fix MissingResourceException