Bug with static keyword fixed