Fixed minor bug in self preservation. Still not perfect. #29