Resolving #171 and #172.