2013-7-22 Fix problems.