Partial fix for #12