Partial fix for #58