Fix #405 (Should we have something general for static custom pages?)