This solves bug #44 - Old code