Fixing bug with system page