another bugfixes