fixing excessive current bugs