Replaced static call to self