Specs forthcoming but I'd like to get the fix out. Fixes #125