Testing fix to help reduce memory footprint.