try 2 at fixing the NPE labisso found