Fix case #40