fixed crashing bug again