Fixed compatibility issues with certain stack setups
Fixed compatibility issues with certain stack setups