fix for custom date