Closing Issue #254