Fix '***' issue (#951) & add corresponding test