Bug fix for too many . Perfect example of why this needs tests