This fix obsoletes #364 right?