Fixed date bug: mixed variable names