note: comment about needing to fix crash