Hack fix till upstream is fixed.