Fix public page issue