fixed null point exception