Embed crash fix