Fix for page navigator error