Cleanly fix the issue 410