should fix last nullponter exception