Partial fix for #9 not #7