Fixed dict issue