Fix #217 and #206?