Replaced user with self, bug fix