proposed fix for #12