definitions bugfixes