+ friggin NPE fixed