Fix issue #356, third shot