BUG FIX: the last entry