More bugfixin