Fix support for EEP 18 empty objects #8