MDL-21781 fixed cap checks