Fixed Issue #267