fix issue with completion block not set