Fix case #37