Fix for one-item groups
v0.13.5