bugfixes boxing