#7 fix for usage within foreign domain