Fixing non-static methods