Fix #30 To be test carfully. Risk of blank page