Comment the dictionary workarounds