Trying to see if this fixes NPE