maybe fixed a random NullPointerException