awaiting committing of this patch into the module.