This is actually a bug fix ...