Bug#217 alternate fix