Bug fix for ResourceBundle refactoring