Changes to handle IE bug