fix previous commit (nullpointer)