Lps 32874

Hey Hugo,

Here's the fix for LPS-32874. Let me know if you got any questions

-ed