null key bug fixed