add additional test and fix for #1