Fixed Issue #272