Partial fix for #163