Arno/issue 493