Fixing record issues see BT#6449