fix null, see #608