this is a terrible bugfix which should not last the week