diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java
index 1e2aeb944..28a645105 100644
--- a/src/main/java/mekanism/api/gas/GasTank.java
+++ b/src/main/java/mekanism/api/gas/GasTank.java
@@ -79,7 +79,7 @@ public class GasTank
 	 */
 	public int receive(GasStack amount, boolean doReceive)
 	{
-		if(amount == null || (stored != null && stored.amount == getMaxGas()))
+		if(amount == null || (stored != null && !(stored.amount != getMaxGas() && stored.isGasEqual(amount))))
 		{
 			return 0;
 		}
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
index 64eba3823..fd70eb154 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -145,7 +145,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
 			GasStack stack = getItemGas(inventory[1]);
 			int gasNeeded = gasTank.getNeeded();
 
-			if(stack != null && stack.amount <= gasNeeded)
+			if(stack != null && gasTank.canReceive(stack.getGas()) && gasNeeded >= stack.amount)
 			{
 				gasTank.receive(stack, true);