Fixing issue with retaining self