Fixed calls to static method