Fix issue #356, second shot