More testing...there must be an edge case out there somewhere...