Attached hopefully a good compromise between the
original bug & improving it.