Addressing issue THRONE-33