20141221-02-fix_some_problems