Fix so that can parse self