Fix for upcoming blank page