Fixed NPE pointed by issue #31