Fix for Long/Double/Date