bugfix for a hack