fixes #114 NPE