Arrange fields breaks date fields

I know this issue was reported back on a drupal 6 RC release, but it was marked as fixed and does not appear to be. Any date or date/time fields I try to use when arranging fields on a CCK layout are broken by arrange fields (even if they were not repositioned or resized). Arrange fields appears to ignore any resizing on saving and revert to a fairly uncoordinated above and below date / time layout that overlaps the label and makes the whole field look a mess. This is a bit of a deal breaker, as the vast majority of my forms will have dates and / or times somewhere in them, and at the moment, not only can I not edit them, but the module appears to break the initial layout making things worse than they were to start with. Is there a workaround for this? Would placing a single date field in field collection avoid the problem maybe? Is there any plan to make this module compatible with dates? Has anybody encountered this before, and maybe come up with a patch?

Any help much appreciated.