Maybe Fix issue #1 ? (NullPointerException)