Fixed null structures bug