Resolving issues documented in issue #133