Adjusted to play nicely with polymer