Removed padding issues for #58