Long term fix to #5 applied.