handle empty case per Issue #16