Fixed bug where self