removed 2 isEmpty() calls - fixed issue #17