Fixing static method bug