Oh man - this has been killing me: I thought we had an internal bug!