Fix for custom URL schemes