Ticket #804: ePortfolio wrap fix