fix for non-english locale systems

previous fix didn't account for few special cases