Pushed fix to getNextEntry