see #510