Making the changes as per the comments in PR https://github.com/DynamoDS/Dynamo/pull/3044/