Fix for latest entry