Fixing bug about entries proccesing