bugfixes (not sure)