see #642