Fix/1264 ie7

Fix for #1264 and #1356