Fixed problems, again...