Workaround for d3 errors. This commit should be reverted and the real issue fixed.