* fix autofill issue (NPE) #67