bugfix (nullpointer problem)