I guess it would be good if we make this change in the module itself.