Fix #74 for OpenTSDB, too