Temporary fix for tooltip issue
Merge pull request #251 from dburdick/swc-491

Temporary fix for tooltip issue