I hope this fixes the NPE - this is quite weird...