Update for 1.7.5
Still getting NPE