Hopefully fixed a crashing bug.