Fixing the issues related to the change of the implementation