multiple changes

doesn't crash anymore.