Tap fix, Empty page fix