taking care of some edge cases in embeds