Fixed completion regarding take-while