fix crash - UNTESTED