fixed constant crashing