Resource usage fix