Reapplied Tucker's fix that I over wrote

sorry Tucker :-)