Preliminary fix for L61115 (Mantis 977)