moineau: temporary change shaft to M8