Fixes #64 and #67

Thanks! Would you mind opening an issue to voice your concerns?