Fix multiple new entries bug :thumbsup: