Adding Polymer fix