Issue #76 — hope this fixes the "&amp; becomes & only" with more stable results