Temporarily fix to #112

(True fix requires infrastructure)