Lps 44052

CC @igorspasic

This is a common problem that we have fixed before with a cleaner solution. Please double check the problem is gone with this fix.