bugfix for RC7