reverted dictionary logic, due to bug in ST