see #525