Fix #142
Fix #132