PR #312 alternative