Added datetime fix to ndabaga