bug fixes with usage of unite