I think we need a bugfix for this