Fix for: PLA-1833