Urgent fix on Common