fix the buggy fix for #19