Yet another fix (Issue #117).