LPS-43266

Hey Hugo,

This was the cleanest way I could resolve this issue (that I could think of), but let me know if it looks weird since I'm not sure if this would pass source formatting or not.

Thanks.