bugfix - null pointer exception