fix to use thunder-common