Fix for #588 DST bug