Added Locale as method parameter to fix common bug source