Fixed last static method issue