Fixed the last bug, maybe