Issue #216 Minor bug fix