Fixed - CON-956