Fix Issue #319