Fixed another and probably the final bug.