Fix #270
Fix #271.