[#637] - Fix resource bundle resolution