see #530