Improved boundry check on requested variant.