Fixing dictionary use