Closing Issue #319