Fixed Issue #261