More changes towards issue #87