Embedded products fix