Fixed 18239756149387634th NPE of the day. WORKS!!!!