Removed crashing bug