Fixing overloading problem