Removed the workaround for pointer dereference