fixing #16
that damn NPE