Added fixSelf method