24.4 related change to remove warning