Fix Bug on adding entries