all entries bug fixed