Fixing issues: #307 and #296.