bugfix - date functions return Calendar instead of Date