Lps 33134

LPS-33134 simplified solution

Sorry, I wanted to sent it to moltam89, but unfortunatelly there is a bug in the git hub.