Fixed null issue