fix for HandData crash