Minor date bug
merge