TJ: backwards compatible with weightless before 0.9