Lps 33655

This is the fix that Tomas Polesovsky  wrote.