Fixed - CON-998