Adds TOFIX nullPointerException issue