Fix for FrontPage setup