fixed crushing bug