Adding the check also for "id" on last commit