bugfix for #1413