bugfix for RC