Fixes static methods calls