Maybe fix weird bug that I can't reproduce...