fix bug for common changes