Issue #270