adapt for versions of storm too.