quick bugfix npe