Fixed problems on 20141118