Fixed static method stuff