Fixing empty list bug #144