Fixed static method bug