Fixed Issue #268