fixed issue with bad self reference