Add strongSelf check