Fix little bug See merge request !10
Zhaoyue dev See merge request !9
Zhaoyue dev4 See merge request !7