Fixing Errors (Dooh!) :-)
First working as expected .... hopefully.