[FIX] Honor proper max calue