Fix Issue #261