nth try to fix null pointer exception. God damn it