bugfixes
merge fix