Feature/fix empty records

A try to fix issue #105