Add support for border cases (max level)