Think I fixed the bug