petervwyatt Fix Issue #5