Partial fix for #126