20141117 fix