Temporarily fixes NPE described in issue #28