Gas usage fix