Fixing for newest Polymer