Fix a bug in e8872d0