attempted bugfixes