fixed the self issues (hopefully?)