null pointer fix
merged up bad reference