bugfix for multipage