fix messed up merge from the previous patch set