fixed dereferencing bugs