Fixed (?) issues from PR #129