"bugfix" needed by client