Fixes incorrect Date conversion