fixed dictionary related issues