Short term fix for #47