fix NPE #14