correct fix for #8