potential-bugfixes