Fix for cross-origin access problem