Mirro fix on PR #311