Lps 33655

This is the fix Tomas Polesovsky came up with.