Partial fix for #2