Fix for date import issue #120 (part 1)