Fix case #36