polymer fixes