fixed issues with static methods