workaround for empty list
API
tests improved