Taking into account changes from PR #150