fixe bug with last commit

should probably talk to ethan about fixing it more elegantly.
(hashtable?)