I think this is a bugfix