fixed null-pointer