Fixing issues #66 and #68.