Another attempt to fix issue #1 using empty?