Fix multiple call to completion blocks