added support for empties