Minor bugfix + Tolerant bounds