Crashing bug corrected