same bugfix as master