Try to fix null pointer exception