better debug info, fixed for last field