Added void* check