Another attempt at final solution for Issue #87