Small data object regression fix