Fixed: populated an initial date when there was none specified