fixed #70 potential NPE