update + fix crash