Fixing Tommy's crap :(.