Fix cleanly the issue 410

Sorry for all the trouble for such a small issue. I hope it is good now.