Bug fix for iFrame Support