Partial fix for #20