Fix case #41