Fix #673, fix rendering with multiple embedded elements