Request #110, Fix #108