Fix scope binding in rest of the modules