bugfixes new fields