sync w/ patrick's change