I'm not sure, but I think this change will break some functionalities.