CON-1486

I moved that to different function.