Refined fix for SCI-1343 by avoiding use of temporary string