Quick fix to not drop last element