Messing with teh API to get more reliable behavior.