fix 'at' glitch & improve robustness, refs #1