fix for #236