#TPA-1354|Added fix that broke the tests