final fix, shouldn't crash anymore