fixed the problems by 20130116