Bug fixed for cross-site option