a crashing bug fixed