additional fix for #4