perhaps fixed an NPE