Issue 266

Alternate approach to #385; needs tests