Second attempt for bugfixes