Another partial fix for #6