Bug fix for style changes coming in v2