removed comments indicating bug avoidance