Fix static vs self