Revert "Revert "Fixed a critical bug where Spices couldn't be applied""

This reverts commit 35d07a94aadb47b1dcee35e247c7298cf76b62ce.