fix bugs with $D016.
Issue #2.