Issue #25: corrected