proposed fix for #5