Built in workaround to prevent 0 not to get submitted