Fix bug caused by Mouq--