Closing Issue #252