Fix for extra padding on groups