Fix to issue #21 its a dirty dirty hack with an if statement and anyone ...

...who ever looks at our code might cry a little at vigor of our code reuse kitchen.