embedding bugfixes