Modified. see #1.