Fixing issues #64 and #65