fixed: NullpointerException