fixed the double handling bug... i think