Fixes 2nd point of issue #40.