Resolve minor bug created in the last merge