Improves issue #1