Updating binary to avoid  NPE