fixed crashy crash