Port IE bugfix to latest (was 0.6.3)