Closes #504. Fix previous commit.