Fixing crashing on page 7