Issue #118 again