Fixes #62 NPE