Replace static call with class reference not object reference