Small fix, the whole thing is still a bit unreliable