fixed bug after last merging with master.