Fix #138 dictionary behavior