Issue #383 Page template fix.