Temporary hotfix for #padder problem