Fix for issue #64 - shortcut dates not setting correctly