I really really hope this is the last bug...