Refined the fix for L61117 (Mantis 978)