quick fix for #38