(fix) #9 Corrected logic for setting up orrdict